From 6094a3c4fee1976110c93341b9ef3f09d37606ab Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Tue, 25 Feb 2020 15:43:55 +0000 Subject: [PATCH] x86/gen-cpuid: Fix Py2/3 compatibility There is a fencepost error on the sys.version_info check which will break on Python 3.0. Reverse the logic to make py2 compatible with py3 (rather than py3 compatible with py2) which will be more natural to follow as py2 usage reduces. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- xen/tools/gen-cpuid.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 362cdb5306..71ea78f4eb 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -3,9 +3,8 @@ import sys, os, re -if (sys.version_info > (3, 0)): - def xrange(x): - return range(x) +if sys.version_info < (3, 0): + range = xrange class Fail(Exception): pass @@ -330,10 +329,10 @@ def crunch_numbers(state): state.deep_deps[k] = featureset_to_uint32s(v, nr_entries) # Calculate the bitfield name declarations - for word in xrange(nr_entries): + for word in range(nr_entries): names = [] - for bit in xrange(32): + for bit in range(32): name = state.names.get(word * 32 + bit, "") -- 2.30.2